From d94b47d960dd63c99580b66c591374eb4ddbedd5 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Fri, 25 Apr 2008 19:47:32 +0000 Subject: [PATCH] Add GBBUILD to configure.in. Need to increase manually on every new release! git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3211 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/configure | 8 ++++++-- gpsbabel/configure.in | 4 +++- gpsbabel/win32/gpsbabel.rc.in | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gpsbabel/configure b/gpsbabel/configure index 3414cf45d..261ac2789 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -656,6 +656,7 @@ DOCVERSION GBMAJOR GBMINOR GBMICRO +GBBUILD build build_cpu build_vendor @@ -1742,7 +1743,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - +# Increase GBBUILD for a new release +GBBUILD=16 # YYYYMMDD, please, if beta, i.e. "-beta20060413" PACKAGE_RELEASE="-beta20080305" @@ -1764,6 +1766,7 @@ GBMICRO=`echo $PACKAGE_VERSION | (IFS="."; read major minor micro; echo $micro)` + # AC_CONFIG_SRCDIR([nmea.c]) ac_config_headers="$ac_config_headers config.h" @@ -5539,6 +5542,7 @@ DOCVERSION!$DOCVERSION$ac_delim GBMAJOR!$GBMAJOR$ac_delim GBMINOR!$GBMINOR$ac_delim GBMICRO!$GBMICRO$ac_delim +GBBUILD!$GBBUILD$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim @@ -5584,7 +5588,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index 8ca404217..759bc5133 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -4,7 +4,8 @@ AC_PREREQ(2.59) AC_INIT(GPSBabel, 1.3.5, BUG-REPORT-ADDRESS) - +# Increase GBBUILD for a new release +GBBUILD=16 # YYYYMMDD, please, if beta, i.e. "-beta20060413" PACKAGE_RELEASE="-beta20080305" AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) @@ -21,6 +22,7 @@ GBMICRO=`echo $PACKAGE_VERSION | (IFS="."; read major minor micro; echo $micro)` AC_SUBST(GBMAJOR) AC_SUBST(GBMINOR) AC_SUBST(GBMICRO) +AC_SUBST(GBBUILD) # AC_CONFIG_SRCDIR([nmea.c]) AC_CONFIG_HEADER([config.h]) diff --git a/gpsbabel/win32/gpsbabel.rc.in b/gpsbabel/win32/gpsbabel.rc.in index 032453569..32c0e44a2 100644 --- a/gpsbabel/win32/gpsbabel.rc.in +++ b/gpsbabel/win32/gpsbabel.rc.in @@ -1,8 +1,8 @@ MAINICON ICON "@srcdir@/win32/gpsbabel.ico" 1 VERSIONINFO -FILEVERSION @GBMAJOR@,@GBMINOR@,@GBMICRO@,0 -PRODUCTVERSION @GBMAJOR@,@GBMINOR@,@GBMICRO@,0 +FILEVERSION @GBMAJOR@,@GBMINOR@,@GBMICRO@,@GBBUILD@ +PRODUCTVERSION @GBMAJOR@,@GBMINOR@,@GBMICRO@,@GBBUILD@ FILEOS 0x4 FILETYPE 0x1 FILESUBTYPE 0x0L -- 2.30.2